Skip to content

feat: shared dispute game migration for interop#19840

Open
stevennevins wants to merge 34 commits intodevelopfrom
feat/interop-shared-dispute-game
Open

feat: shared dispute game migration for interop#19840
stevennevins wants to merge 34 commits intodevelopfrom
feat/interop-shared-dispute-game

Conversation

@stevennevins
Copy link
Copy Markdown
Contributor

@stevennevins stevennevins commented Mar 31, 2026

Description

Move migrateToSuperRoots(), migrateLiquidity(), and 3 param initialize() from OptimismPortalInterop to OptimismPortal2.

And unify OPCM_V2 to target OptimismPortal2 for the Interop migration codepath

Tests

Tests the superchain system features are properly configured
Tests that migration succeeds with the system feature is enabled

Additional context

Part of #19699

Associated design doc: https://github.com/ethereum-optimism/design-docs/blob/main/protocol/proofs/shared-dispute-game-migration.md

Metadata

Closes #19708
Closes #19710
Closes #19011

@stevennevins stevennevins requested review from a team and JosepBove March 31, 2026 18:38
@codecov
Copy link
Copy Markdown

codecov bot commented Mar 31, 2026

Codecov Report

❌ Patch coverage is 92.30769% with 3 lines in your changes missing coverage. Please review.
✅ Project coverage is 77.9%. Comparing base (69bbccc) to head (0bb90ac).

Files with missing lines Patch % Lines
...contracts-bedrock/src/L1/OptimismPortalInterop.sol 0.0% 2 Missing ⚠️
...kages/contracts-bedrock/src/L1/OptimismPortal2.sol 96.1% 1 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff             @@
##           develop   #19840      +/-   ##
===========================================
+ Coverage     75.8%    77.9%    +2.0%     
===========================================
  Files          683      139     -544     
  Lines        72644     6843   -65801     
===========================================
- Hits         55092     5331   -49761     
+ Misses       17408     1512   -15896     
+ Partials       144        0     -144     
Flag Coverage Δ
cannon-go-tests-64 ?
contracts-bedrock-tests 77.9% <92.3%> (-2.0%) ⬇️
unit ?

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing lines Coverage Δ
packages/contracts-bedrock/src/L1/ETHLockbox.sol 100.0% <100.0%> (ø)
...ock/src/L1/OPContractsManagerStandardValidator.sol 97.5% <100.0%> (-0.1%) ⬇️
...edrock/src/L1/opcm/OPContractsManagerContainer.sol 100.0% <ø> (ø)
...bedrock/src/L1/opcm/OPContractsManagerMigrator.sol 95.8% <100.0%> (ø)
...racts-bedrock/src/L1/opcm/OPContractsManagerV2.sol 97.2% <100.0%> (-0.6%) ⬇️
...es/contracts-bedrock/src/libraries/DevFeatures.sol 100.0% <ø> (ø)
...kages/contracts-bedrock/src/L1/OptimismPortal2.sol 98.1% <96.1%> (-0.4%) ⬇️
...contracts-bedrock/src/L1/OptimismPortalInterop.sol 3.4% <0.0%> (-95.2%) ⬇️

... and 544 files with indirect coverage changes

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@pauldowman pauldowman linked an issue Apr 1, 2026 that may be closed by this pull request
@stevennevins stevennevins force-pushed the feat/interop-shared-dispute-game branch from 6f4c1bd to 10808b1 Compare April 3, 2026 14:27
@stevennevins stevennevins requested review from maurelian and wwared April 3, 2026 14:46
stevennevins and others added 14 commits April 3, 2026 12:43
…rade ordering

Bump OptimismPortal2.version() from 5.4.0 to 5.5.0 so OPCM_V2 can
upgrade from OptimismPortalInterop (5.4.1+interop) without triggering
the DowngradeNotAllowed check.

In OPContractsManagerV2._apply(), set the ETH_LOCKBOX feature on
SystemConfig before upgrading the portal. Unlike OptimismPortalInterop
which blindly sets the ethLockbox, OptimismPortal2.initialize() calls
_assertValidLockboxState() which requires the ETH_LOCKBOX feature flag
and ethLockbox address to be consistent.

Update superRootsActive tests to support both OPCM_V2 (gameType mock)
and legacy (slot 63 manipulation) paths via _enableSuperRootBehavior
helper.
…lInterop when OPCM_V2 and Interop feature flags enabled
@stevennevins stevennevins force-pushed the feat/interop-shared-dispute-game branch from 34ae54c to 8a0e690 Compare April 3, 2026 16:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

2 participants